Add default return values to switch statements

We are using g_assert_not_reached() without doing anything, assuming it
aborts the program. In release builds however, it is ignored.

diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
index 350a79b03f0ea2abc3104006d59b2d42cf1ab81d..dd8613e3fddc46a5496ff3eb99e5fe09caf7b9c5 100644 (file)
--- a/gdk/x11/gdkdevicemanager-core-x11.c
+++ b/gdk/x11/gdkdevicemanager-core-x11.c
@@ -265,6 +265,7 @@ translate_crossing_mode (int mode)
       return GDK_CROSSING_UNGRAB;
     default:
       g_assert_not_reached ();
+      return GDK_CROSSING_NORMAL;
     }
 }
 
@@ -285,6 +286,7 @@ translate_notify_type (int detail)
       return GDK_NOTIFY_NONLINEAR_VIRTUAL;
     default:
       g_assert_not_reached ();
+      return GDK_NOTIFY_UNKONWN;
     }
 }
 

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 8779c65a72454595e71c6ccea49497a46732dafc..758513e4dbd7bd3db690dece12b2114ac8b5b4c6 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -1068,6 +1068,7 @@ translate_crossing_mode (gint mode)
       /* Fall through, unexpected in pointer crossing events */
     default:
       g_assert_not_reached ();
+      return GDK_CROSSING_NORMAL;
     }
 }
 
@@ -1088,6 +1089,7 @@ translate_notify_type (gint detail)
       return GDK_NOTIFY_NONLINEAR_VIRTUAL;
     default:
       g_assert_not_reached ();
+      return GDK_NOTIFY_UNKONWN;
     }
 }
 

diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
index 241a690230394ffda5a7e60ed182ad949fde2702..961e78ea5c86e704ceaa2048759380cccaf76aa9 100644 (file)
--- a/gtk/gtkcssselector.c
+++ b/gtk/gtkcssselector.c
@@ -876,6 +876,7 @@ change_pseudoclass_position (const GtkCssSelector *selector)
       return GTK_CSS_CHANGE_FIRST_CHILD | GTK_CSS_CHANGE_LAST_CHILD;
     default:
       g_assert_not_reached ();
+      return 0;
     }
 }
 

diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 2e7e21207bec6292b2a0a94b8717d53b58efd71e..62404a05c6aa35e2f06527bc1318267cb5bf1eb9 100644 (file)
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel)
     case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr";
     case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb";
     case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr";
-    default: g_assert_not_reached ();
+    default: g_assert_not_reached (); return "none;
     }
 }